merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 31 Jan 2012 11:22:40 +0000 (20:22 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 31 Jan 2012 11:22:40 +0000 (20:22 +0900)

Trivial merge